/***************************************************************************
- * Copyright (C) 2005-09 by the Quassel Project *
+ * Copyright (C) 2005-2018 by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the *
* Free Software Foundation, Inc., *
- * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
#include "client.h"
+#include <cstdio>
+#include <cstdlib>
+
#include "abstractmessageprocessor.h"
+#include "abstractui.h"
#include "bufferinfo.h"
#include "buffermodel.h"
#include "buffersettings.h"
#include "buffersyncer.h"
#include "bufferviewconfig.h"
-#include "bufferviewmanager.h"
+#include "bufferviewoverlay.h"
+#include "clientaliasmanager.h"
+#include "clientauthhandler.h"
#include "clientbacklogmanager.h"
-#include "clientirclisthelper.h"
+#include "clientbufferviewmanager.h"
#include "clientidentity.h"
+#include "clientignorelistmanager.h"
+#include "clientirclisthelper.h"
+#include "clienttransfermanager.h"
+#include "clientuserinputhandler.h"
+#include "coreaccountmodel.h"
+#include "coreconnection.h"
+#include "dccconfig.h"
#include "ircchannel.h"
#include "ircuser.h"
#include "message.h"
#include "messagemodel.h"
#include "network.h"
+#include "networkconfig.h"
#include "networkmodel.h"
#include "quassel.h"
-#include "quasselui.h"
#include "signalproxy.h"
+#include "transfermodel.h"
#include "util.h"
-#include <stdio.h>
-#include <stdlib.h>
-
-QPointer<Client> Client::instanceptr = 0;
-AccountId Client::_currentCoreAccount = 0;
-
-/*** Initialization/destruction ***/
-
-Client *Client::instance() {
- if(!instanceptr)
- instanceptr = new Client();
- return instanceptr;
-}
-
-void Client::destroy() {
- if(instanceptr) {
- delete instanceptr->mainUi();
- instanceptr->deleteLater();
- instanceptr = 0;
- }
-}
-
-void Client::init(AbstractUi *ui) {
- instance()->_mainUi = ui;
- instance()->init();
-}
-
-Client::Client(QObject *parent)
- : QObject(parent),
- _signalProxy(new SignalProxy(SignalProxy::Client, this)),
- _mainUi(0),
- _networkModel(0),
- _bufferModel(0),
- _bufferSyncer(0),
- _backlogManager(new ClientBacklogManager(this)),
- _bufferViewManager(0),
- _ircListHelper(new ClientIrcListHelper(this)),
- _messageModel(0),
- _messageProcessor(0),
- _connectedToCore(false),
- _syncedToCore(false),
- _internalCore(false),
- _debugLog(&_debugLogBuffer)
+Client::Client(std::unique_ptr<AbstractUi> ui, QObject* parent)
+ : QObject(parent)
+ , Singleton<Client>(this)
+ , _signalProxy(new SignalProxy(SignalProxy::Client, this))
+ , _mainUi(std::move(ui))
+ , _networkModel(new NetworkModel(this))
+ , _bufferModel(new BufferModel(_networkModel))
+ , _backlogManager(new ClientBacklogManager(this))
+ , _bufferViewOverlay(new BufferViewOverlay(this))
+ , _coreInfo(new CoreInfo(this))
+ , _ircListHelper(new ClientIrcListHelper(this))
+ , _inputHandler(new ClientUserInputHandler(this))
+ , _transferModel(new TransferModel(this))
+ , _messageModel(_mainUi->createMessageModel(this))
+ , _messageProcessor(_mainUi->createMessageProcessor(this))
+ , _coreAccountModel(new CoreAccountModel(this))
+ , _coreConnection(new CoreConnection(this))
{
- _signalProxy->synchronize(_ircListHelper);
-}
+#ifdef EMBED_DATA
+ Q_INIT_RESOURCE(data);
+#endif
-Client::~Client() {
- disconnectFromCore();
-}
+ connect(mainUi(), &AbstractUi::disconnectFromCore, this, &Client::disconnectFromCore);
+ connect(this, &Client::connected, mainUi(), &AbstractUi::connectedToCore);
+ connect(this, &Client::disconnected, mainUi(), &AbstractUi::disconnectedFromCore);
-void Client::init() {
- _currentCoreAccount = 0;
- _networkModel = new NetworkModel(this);
+ connect(this, &Client::networkRemoved, _networkModel, &NetworkModel::networkRemoved);
+ connect(this, &Client::networkRemoved, _messageProcessor, &AbstractMessageProcessor::networkRemoved);
- connect(this, SIGNAL(networkRemoved(NetworkId)),
- _networkModel, SLOT(networkRemoved(NetworkId)));
+ connect(backlogManager(), &ClientBacklogManager::messagesReceived, _messageModel, &MessageModel::messagesReceived);
+ connect(coreConnection(), &CoreConnection::stateChanged, this, &Client::connectionStateChanged);
- _bufferModel = new BufferModel(_networkModel);
- _messageModel = mainUi()->createMessageModel(this);
- _messageProcessor = mainUi()->createMessageProcessor(this);
+ SignalProxy* p = signalProxy();
- SignalProxy *p = signalProxy();
+ p->attachSlot(SIGNAL(displayMsg(Message)), this, &Client::recvMessage);
+ p->attachSlot(SIGNAL(displayStatusMsg(QString,QString)), this, &Client::recvStatusMsg);
- p->attachSlot(SIGNAL(displayMsg(const Message &)), this, SLOT(recvMessage(const Message &)));
- p->attachSlot(SIGNAL(displayStatusMsg(QString, QString)), this, SLOT(recvStatusMsg(QString, QString)));
+ p->attachSlot(SIGNAL(bufferInfoUpdated(BufferInfo)), _networkModel, &NetworkModel::bufferUpdated);
+ p->attachSignal(inputHandler(), &ClientUserInputHandler::sendInput);
+ p->attachSignal(this, &Client::requestNetworkStates);
- p->attachSlot(SIGNAL(bufferInfoUpdated(BufferInfo)), _networkModel, SLOT(bufferUpdated(BufferInfo)));
- p->attachSignal(this, SIGNAL(sendInput(BufferInfo, QString)));
- p->attachSignal(this, SIGNAL(requestNetworkStates()));
+ p->attachSignal(this, &Client::requestCreateIdentity, SIGNAL(createIdentity(Identity,QVariantMap)));
+ p->attachSignal(this, &Client::requestRemoveIdentity, SIGNAL(removeIdentity(IdentityId)));
+ p->attachSlot(SIGNAL(identityCreated(Identity)), this, &Client::coreIdentityCreated);
+ p->attachSlot(SIGNAL(identityRemoved(IdentityId)), this, &Client::coreIdentityRemoved);
- p->attachSignal(this, SIGNAL(requestCreateIdentity(const Identity &, const QVariantMap &)), SIGNAL(createIdentity(const Identity &, const QVariantMap &)));
- p->attachSignal(this, SIGNAL(requestRemoveIdentity(IdentityId)), SIGNAL(removeIdentity(IdentityId)));
- p->attachSlot(SIGNAL(identityCreated(const Identity &)), this, SLOT(coreIdentityCreated(const Identity &)));
- p->attachSlot(SIGNAL(identityRemoved(IdentityId)), this, SLOT(coreIdentityRemoved(IdentityId)));
+ p->attachSignal(this, &Client::requestCreateNetwork, SIGNAL(createNetwork(NetworkInfo,QStringList)));
+ p->attachSignal(this, &Client::requestRemoveNetwork, SIGNAL(removeNetwork(NetworkId)));
+ p->attachSlot(SIGNAL(networkCreated(NetworkId)), this, &Client::coreNetworkCreated);
+ p->attachSlot(SIGNAL(networkRemoved(NetworkId)), this, &Client::coreNetworkRemoved);
- p->attachSignal(this, SIGNAL(requestCreateNetwork(const NetworkInfo &)), SIGNAL(createNetwork(const NetworkInfo &)));
- p->attachSignal(this, SIGNAL(requestRemoveNetwork(NetworkId)), SIGNAL(removeNetwork(NetworkId)));
- p->attachSlot(SIGNAL(networkCreated(NetworkId)), this, SLOT(coreNetworkCreated(NetworkId)));
- p->attachSlot(SIGNAL(networkRemoved(NetworkId)), this, SLOT(coreNetworkRemoved(NetworkId)));
+ p->attachSignal(this, &Client::requestPasswordChange, SIGNAL(changePassword(PeerPtr,QString,QString,QString)));
+ p->attachSlot(SIGNAL(passwordChanged(PeerPtr,bool)), this, &Client::corePasswordChanged);
- connect(p, SIGNAL(disconnected()), this, SLOT(disconnectedFromCore()));
+ p->attachSignal(this, &Client::requestKickClient, SIGNAL(kickClient(int)));
+ p->attachSlot(SIGNAL(disconnectFromCore()), this, &Client::disconnectFromCore);
- //connect(mainUi(), SIGNAL(connectToCore(const QVariantMap &)), this, SLOT(connectToCore(const QVariantMap &)));
- connect(mainUi(), SIGNAL(disconnectFromCore()), this, SLOT(disconnectFromCore()));
- connect(this, SIGNAL(connected()), mainUi(), SLOT(connectedToCore()));
- connect(this, SIGNAL(disconnected()), mainUi(), SLOT(disconnectedFromCore()));
+ p->synchronize(backlogManager());
+ p->synchronize(coreInfo());
+ p->synchronize(_ircListHelper);
- // attach backlog manager
- p->synchronize(backlogManager());
- connect(backlogManager(), SIGNAL(messagesReceived(BufferId, int)), _messageModel, SLOT(messagesReceived(BufferId, int)));
+ coreAccountModel()->load();
+ coreConnection()->init();
}
-/*** public static methods ***/
+Client::~Client()
+{
+ disconnectFromCore();
+}
-AbstractUi *Client::mainUi() {
- return instance()->_mainUi;
+AbstractUi* Client::mainUi()
+{
+ return instance()->_mainUi.get();
}
-AccountId Client::currentCoreAccount() {
- return _currentCoreAccount;
+bool Client::isCoreFeatureEnabled(Quassel::Feature feature)
+{
+ return coreConnection()->peer() ? coreConnection()->peer()->hasFeature(feature) : false;
}
-void Client::setCurrentCoreAccount(AccountId id) {
- _currentCoreAccount = id;
+bool Client::isConnected()
+{
+ return instance()->_connected;
}
-bool Client::isConnected() {
- return instance()->_connectedToCore;
+bool Client::internalCore()
+{
+ return currentCoreAccount().isInternal();
}
-bool Client::isSynced() {
- return instance()->_syncedToCore;
+void Client::onDbUpgradeInProgress(bool inProgress)
+{
+ emit dbUpgradeInProgress(inProgress);
+}
+
+void Client::onExitRequested(int exitCode, const QString& reason)
+{
+ if (!reason.isEmpty()) {
+ qCritical() << reason;
+ emit exitRequested(reason);
+ }
+ QCoreApplication::exit(exitCode);
}
/*** Network handling ***/
-QList<NetworkId> Client::networkIds() {
- return instance()->_networks.keys();
+QList<NetworkId> Client::networkIds()
+{
+ return instance()->_networks.keys();
}
-const Network * Client::network(NetworkId networkid) {
- if(instance()->_networks.contains(networkid)) return instance()->_networks[networkid];
- else return 0;
+const Network* Client::network(NetworkId networkid)
+{
+ if (instance()->_networks.contains(networkid))
+ return instance()->_networks[networkid];
+ else
+ return nullptr;
}
-void Client::createNetwork(const NetworkInfo &info) {
- emit instance()->requestCreateNetwork(info);
+void Client::createNetwork(const NetworkInfo& info, const QStringList& persistentChannels)
+{
+ emit instance()->requestCreateNetwork(info, persistentChannels);
}
-void Client::removeNetwork(NetworkId id) {
- emit instance()->requestRemoveNetwork(id);
+void Client::removeNetwork(NetworkId id)
+{
+ emit instance()->requestRemoveNetwork(id);
}
-void Client::updateNetwork(const NetworkInfo &info) {
- Network *netptr = instance()->_networks.value(info.networkId, 0);
- if(!netptr) {
- qWarning() << "Update for unknown network requested:" << info;
- return;
- }
- netptr->requestSetNetworkInfo(info);
+void Client::updateNetwork(const NetworkInfo& info)
+{
+ Network* netptr = instance()->_networks.value(info.networkId, 0);
+ if (!netptr) {
+ qWarning() << "Update for unknown network requested:" << info;
+ return;
+ }
+ netptr->requestSetNetworkInfo(info);
}
-void Client::addNetwork(Network *net) {
- net->setProxy(signalProxy());
- signalProxy()->synchronize(net);
- networkModel()->attachNetwork(net);
- connect(net, SIGNAL(destroyed()), instance(), SLOT(networkDestroyed()));
- instance()->_networks[net->networkId()] = net;
- emit instance()->networkCreated(net->networkId());
+void Client::addNetwork(Network* net)
+{
+ net->setProxy(signalProxy());
+ signalProxy()->synchronize(net);
+ networkModel()->attachNetwork(net);
+ connect(net, &QObject::destroyed, instance(), &Client::networkDestroyed);
+ instance()->_networks[net->networkId()] = net;
+ emit instance()->networkCreated(net->networkId());
}
-void Client::coreNetworkCreated(NetworkId id) {
- if(_networks.contains(id)) {
- qWarning() << "Creation of already existing network requested!";
- return;
- }
- Network *net = new Network(id, this);
- addNetwork(net);
+void Client::coreNetworkCreated(NetworkId id)
+{
+ if (_networks.contains(id)) {
+ qWarning() << "Creation of already existing network requested!";
+ return;
+ }
+ auto* net = new Network(id, this);
+ addNetwork(net);
}
-void Client::coreNetworkRemoved(NetworkId id) {
- if(!_networks.contains(id))
- return;
- Network *net = _networks.take(id);
- emit networkRemoved(net->networkId());
- net->deleteLater();
+void Client::coreNetworkRemoved(NetworkId id)
+{
+ if (!_networks.contains(id))
+ return;
+ Network* net = _networks.take(id);
+ emit networkRemoved(net->networkId());
+ net->deleteLater();
}
/*** Identity handling ***/
-QList<IdentityId> Client::identityIds() {
- return instance()->_identities.keys();
+QList<IdentityId> Client::identityIds()
+{
+ return instance()->_identities.keys();
}
-const Identity *Client::identity(IdentityId id) {
- if(instance()->_identities.contains(id)) return instance()->_identities[id];
- else return 0;
+const Identity* Client::identity(IdentityId id)
+{
+ if (instance()->_identities.contains(id))
+ return instance()->_identities[id];
+ else
+ return nullptr;
}
-void Client::createIdentity(const CertIdentity &id) {
- QVariantMap additional;
+void Client::createIdentity(const CertIdentity& id)
+{
+ QVariantMap additional;
#ifdef HAVE_SSL
- additional["KeyPem"] = id.sslKey().toPem();
- additional["CertPem"] = id.sslCert().toPem();
+ additional["KeyPem"] = id.sslKey().toPem();
+ additional["CertPem"] = id.sslCert().toPem();
#endif
- emit instance()->requestCreateIdentity(id, additional);
+ emit instance()->requestCreateIdentity(id, additional);
}
-void Client::updateIdentity(IdentityId id, const QVariantMap &ser) {
- Identity *idptr = instance()->_identities.value(id, 0);
- if(!idptr) {
- qWarning() << "Update for unknown identity requested:" << id;
- return;
- }
- idptr->requestUpdate(ser);
+void Client::updateIdentity(IdentityId id, const QVariantMap& ser)
+{
+ Identity* idptr = instance()->_identities.value(id, 0);
+ if (!idptr) {
+ qWarning() << "Update for unknown identity requested:" << id;
+ return;
+ }
+ idptr->requestUpdate(ser);
}
-void Client::removeIdentity(IdentityId id) {
- emit instance()->requestRemoveIdentity(id);
+void Client::removeIdentity(IdentityId id)
+{
+ emit instance()->requestRemoveIdentity(id);
}
-void Client::coreIdentityCreated(const Identity &other) {
- if(!_identities.contains(other.id())) {
- Identity *identity = new Identity(other, this);
- _identities[other.id()] = identity;
- identity->setInitialized();
- signalProxy()->synchronize(identity);
- emit identityCreated(other.id());
- } else {
- qWarning() << tr("Identity already exists in client!");
- }
+void Client::coreIdentityCreated(const Identity& other)
+{
+ if (!_identities.contains(other.id())) {
+ auto* identity = new Identity(other, this);
+ _identities[other.id()] = identity;
+ identity->setInitialized();
+ signalProxy()->synchronize(identity);
+ emit identityCreated(other.id());
+ }
+ else {
+ qWarning() << tr("Identity already exists in client!");
+ }
}
-void Client::coreIdentityRemoved(IdentityId id) {
- if(_identities.contains(id)) {
- emit identityRemoved(id);
- Identity *i = _identities.take(id);
- i->deleteLater();
- }
+void Client::coreIdentityRemoved(IdentityId id)
+{
+ if (_identities.contains(id)) {
+ emit identityRemoved(id);
+ Identity* i = _identities.take(id);
+ i->deleteLater();
+ }
}
-/*** ***/
-void Client::userInput(BufferInfo bufferInfo, QString message) {
- emit instance()->sendInput(bufferInfo, message);
+/*** User input handling ***/
+
+void Client::userInput(const BufferInfo& bufferInfo, const QString& message)
+{
+ // we need to make sure that AliasManager is ready before processing input
+ if (aliasManager() && aliasManager()->isInitialized())
+ inputHandler()->handleUserInput(bufferInfo, message);
+ else
+ instance()->_userInputBuffer.append(qMakePair(bufferInfo, message));
}
-/*** core connection stuff ***/
+void Client::sendBufferedUserInput()
+{
+ for (int i = 0; i < _userInputBuffer.count(); i++)
+ userInput(_userInputBuffer.at(i).first, _userInputBuffer.at(i).second);
-void Client::setConnectedToCore(AccountId id, QIODevice *socket) {
- if(socket) { // external core
- // if the socket is an orphan, the signalProxy adopts it.
- // -> we don't need to care about it anymore
- socket->setParent(0);
- signalProxy()->addPeer(socket);
- }
- _internalCore = !socket;
- _connectedToCore = true;
- setCurrentCoreAccount(id);
+ _userInputBuffer.clear();
}
-void Client::setSyncedToCore() {
- // create buffersyncer
- Q_ASSERT(!_bufferSyncer);
- _bufferSyncer = new BufferSyncer(this);
- connect(bufferSyncer(), SIGNAL(lastSeenMsgSet(BufferId, MsgId)), _networkModel, SLOT(setLastSeenMsgId(BufferId, MsgId)));
- connect(bufferSyncer(), SIGNAL(bufferRemoved(BufferId)), this, SLOT(bufferRemoved(BufferId)));
- connect(bufferSyncer(), SIGNAL(bufferRenamed(BufferId, QString)), this, SLOT(bufferRenamed(BufferId, QString)));
- connect(bufferSyncer(), SIGNAL(buffersPermanentlyMerged(BufferId, BufferId)), this, SLOT(buffersPermanentlyMerged(BufferId, BufferId)));
- connect(bufferSyncer(), SIGNAL(buffersPermanentlyMerged(BufferId, BufferId)), _messageModel, SLOT(buffersPermanentlyMerged(BufferId, BufferId)));
- connect(bufferSyncer(), SIGNAL(initDone()), this, SLOT(requestInitialBacklog()));
- connect(networkModel(), SIGNAL(setLastSeenMsg(BufferId, MsgId)), bufferSyncer(), SLOT(requestSetLastSeenMsg(BufferId, const MsgId &)));
- signalProxy()->synchronize(bufferSyncer());
+/*** core connection stuff ***/
- // create a new BufferViewManager
- Q_ASSERT(!_bufferViewManager);
- _bufferViewManager = new BufferViewManager(signalProxy(), this);
- connect(bufferViewManager(), SIGNAL(initDone()), this, SLOT(requestInitialBacklog()));
- connect(bufferViewManager(), SIGNAL(initDone()), this, SLOT(createDefautBufferView()));
+void Client::connectionStateChanged(CoreConnection::ConnectionState state)
+{
+ switch (state) {
+ case CoreConnection::Disconnected:
+ setDisconnectedFromCore();
+ break;
+ case CoreConnection::Synchronized:
+ setSyncedToCore();
+ break;
+ default:
+ break;
+ }
+}
- createDefaultIdentity();
+void Client::setSyncedToCore()
+{
+ // create buffersyncer
+ Q_ASSERT(!_bufferSyncer);
+ _bufferSyncer = new BufferSyncer(this);
+ connect(bufferSyncer(), &BufferSyncer::lastSeenMsgSet, _networkModel, &NetworkModel::setLastSeenMsgId);
+ connect(bufferSyncer(), &BufferSyncer::markerLineSet, _networkModel, &NetworkModel::setMarkerLineMsgId);
+ connect(bufferSyncer(), &BufferSyncer::bufferRemoved, this, &Client::bufferRemoved);
+ connect(bufferSyncer(), &BufferSyncer::bufferRenamed, this, &Client::bufferRenamed);
+ connect(bufferSyncer(), &BufferSyncer::buffersPermanentlyMerged, this, &Client::buffersPermanentlyMerged);
+ connect(bufferSyncer(), &BufferSyncer::buffersPermanentlyMerged, _messageModel, &MessageModel::buffersPermanentlyMerged);
+ connect(bufferSyncer(), &BufferSyncer::bufferMarkedAsRead, this, &Client::bufferMarkedAsRead);
+ connect(bufferSyncer(), &BufferSyncer::bufferActivityChanged, _networkModel, &NetworkModel::bufferActivityChanged);
+ connect(bufferSyncer(), &BufferSyncer::highlightCountChanged, _networkModel, &NetworkModel::highlightCountChanged);
+ connect(networkModel(), &NetworkModel::requestSetLastSeenMsg, bufferSyncer(), &BufferSyncer::requestSetLastSeenMsg);
+
+ SignalProxy* p = signalProxy();
+ p->synchronize(bufferSyncer());
+
+ // create a new BufferViewManager
+ Q_ASSERT(!_bufferViewManager);
+ _bufferViewManager = new ClientBufferViewManager(p, this);
+ connect(_bufferViewManager, &SyncableObject::initDone, _bufferViewOverlay, &BufferViewOverlay::restore);
+
+ // create AliasManager
+ Q_ASSERT(!_aliasManager);
+ _aliasManager = new ClientAliasManager(this);
+ connect(aliasManager(), &SyncableObject::initDone, this, &Client::sendBufferedUserInput);
+ p->synchronize(aliasManager());
+
+ // create NetworkConfig
+ Q_ASSERT(!_networkConfig);
+ _networkConfig = new NetworkConfig("GlobalNetworkConfig", this);
+ p->synchronize(networkConfig());
+
+ // create IgnoreListManager
+ Q_ASSERT(!_ignoreListManager);
+ _ignoreListManager = new ClientIgnoreListManager(this);
+ p->synchronize(ignoreListManager());
+
+ // create Core-Side HighlightRuleManager
+ Q_ASSERT(!_highlightRuleManager);
+ _highlightRuleManager = new HighlightRuleManager(this);
+ p->synchronize(highlightRuleManager());
+ // Listen to network removed events
+ connect(this, &Client::networkRemoved, _highlightRuleManager, &HighlightRuleManager::networkRemoved);
+
+ /* not ready yet
+ // create TransferManager and DccConfig if core supports them
+ Q_ASSERT(!_dccConfig);
+ Q_ASSERT(!_transferManager);
+ if (isCoreFeatureEnabled(Quassel::Feature::DccFileTransfer)) {
+ _dccConfig = new DccConfig(this);
+ p->synchronize(dccConfig());
+ _transferManager = new ClientTransferManager(this);
+ _transferModel->setManager(_transferManager);
+ p->synchronize(transferManager());
+ }
+ */
+
+ // trigger backlog request once all active bufferviews are initialized
+ connect(bufferViewOverlay(), &BufferViewOverlay::initDone, this, &Client::finishConnectionInitialization);
+
+ _connected = true;
+ emit connected();
+ emit coreConnectionStateChanged(true);
+}
+
+void Client::finishConnectionInitialization()
+{
+ // usually it _should_ take longer until the bufferViews are initialized, so that's what
+ // triggers this slot. But we have to make sure that we know all buffers yet.
+ // so we check the BufferSyncer and in case it wasn't initialized we wait for that instead
+ if (!bufferSyncer()->isInitialized()) {
+ disconnect(bufferViewOverlay(), &BufferViewOverlay::initDone, this, &Client::finishConnectionInitialization);
+ connect(bufferSyncer(), &SyncableObject::initDone, this, &Client::finishConnectionInitialization);
+ return;
+ }
+ disconnect(bufferViewOverlay(), &BufferViewOverlay::initDone, this, &Client::finishConnectionInitialization);
+ disconnect(bufferSyncer(), &SyncableObject::initDone, this, &Client::finishConnectionInitialization);
- _syncedToCore = true;
- emit connected();
- emit coreConnectionStateChanged(true);
+ requestInitialBacklog();
+ if (isCoreFeatureEnabled(Quassel::Feature::BufferActivitySync)) {
+ bufferSyncer()->markActivitiesChanged();
+ bufferSyncer()->markHighlightCountsChanged();
+ }
}
-void Client::requestInitialBacklog() {
- if(bufferViewManager()->isInitialized() && bufferSyncer()->isInitialized())
- Client::backlogManager()->requestInitialBacklog();
+void Client::requestInitialBacklog()
+{
+ _backlogManager->requestInitialBacklog();
}
-void Client::createDefautBufferView() {
- if(bufferViewManager()->bufferViewConfigs().isEmpty()) {
- BufferViewConfig config(-1);
- config.setBufferViewName(tr("All Buffers"));
- config.initSetBufferList(networkModel()->allBufferIdsSorted());
- bufferViewManager()->requestCreateBufferView(config.toVariantMap());
- }
+void Client::requestLegacyCoreInfo()
+{
+ // On older cores, the CoreInfo object was only synchronized on demand. Synchronize now if
+ // needed.
+ if (isConnected() && !isCoreFeatureEnabled(Quassel::Feature::SyncedCoreInfo)) {
+ // Delete the existing core info object (it will always exist as client is single-threaded)
+ _coreInfo->deleteLater();
+ // No need to set to null when creating new one immediately after
+
+ // Create a fresh, unsynchronized CoreInfo object, emulating legacy behavior of CoreInfo not
+ // persisting
+ _coreInfo = new CoreInfo(this);
+ // Synchronize the new object
+ signalProxy()->synchronize(_coreInfo);
+
+ // Let others know signal handlers have been reset
+ emit coreInfoResynchronized();
+ }
}
-void Client::createDefaultIdentity() {
- if(_identities.isEmpty()) {
- Identity identity;
- identity.setToDefaults();
- identity.setIdentityName(tr("Default Identity"));
- createIdentity(identity);
- }
-}
+void Client::disconnectFromCore()
+{
+ if (!coreConnection()->isConnected())
+ return;
-void Client::setSecuredConnection() {
- emit securedConnection();
+ coreConnection()->disconnectFromCore();
}
-void Client::disconnectFromCore() {
- if(!isConnected())
- return;
+void Client::setDisconnectedFromCore()
+{
+ _connected = false;
- signalProxy()->removeAllPeers();
-}
+ emit disconnected();
+ emit coreConnectionStateChanged(false);
-void Client::disconnectedFromCore() {
- _connectedToCore = false;
- _syncedToCore = false;
- emit disconnected();
- emit coreConnectionStateChanged(false);
+ backlogManager()->reset();
+ messageProcessor()->reset();
- backlogManager()->reset();
- messageProcessor()->reset();
+ // Clear internal data. Hopefully nothing relies on it at this point.
- // Clear internal data. Hopefully nothing relies on it at this point.
- setCurrentCoreAccount(0);
+ if (_bufferSyncer) {
+ _bufferSyncer->deleteLater();
+ _bufferSyncer = nullptr;
+ }
- if(_bufferSyncer) {
- _bufferSyncer->deleteLater();
- _bufferSyncer = 0;
- }
+ _coreInfo->reset();
- if(_bufferViewManager) {
- _bufferViewManager->deleteLater();
- _bufferViewManager = 0;
- }
+ if (_bufferViewManager) {
+ _bufferViewManager->deleteLater();
+ _bufferViewManager = nullptr;
+ }
- _messageModel->clear();
- _networkModel->clear();
+ _bufferViewOverlay->reset();
- QHash<NetworkId, Network*>::iterator netIter = _networks.begin();
- while(netIter != _networks.end()) {
- Network *net = netIter.value();
- emit networkRemoved(net->networkId());
- disconnect(net, SIGNAL(destroyed()), this, 0);
- netIter = _networks.erase(netIter);
- net->deleteLater();
- }
- Q_ASSERT(_networks.isEmpty());
+ if (_aliasManager) {
+ _aliasManager->deleteLater();
+ _aliasManager = nullptr;
+ }
+
+ if (_ignoreListManager) {
+ _ignoreListManager->deleteLater();
+ _ignoreListManager = nullptr;
+ }
- QHash<IdentityId, Identity *>::iterator idIter = _identities.begin();
- while(idIter != _identities.end()) {
- emit identityRemoved(idIter.key());
- Identity *id = idIter.value();
- idIter = _identities.erase(idIter);
- id->deleteLater();
- }
- Q_ASSERT(_identities.isEmpty());
+ if (_highlightRuleManager) {
+ _highlightRuleManager->deleteLater();
+ _highlightRuleManager = nullptr;
+ }
+
+ if (_transferManager) {
+ _transferModel->setManager(nullptr);
+ _transferManager->deleteLater();
+ _transferManager = nullptr;
+ }
+
+ if (_dccConfig) {
+ _dccConfig->deleteLater();
+ _dccConfig = nullptr;
+ }
+
+ // we probably don't want to save pending input for reconnect
+ _userInputBuffer.clear();
+ _messageModel->clear();
+ _networkModel->clear();
+
+ QHash<NetworkId, Network*>::iterator netIter = _networks.begin();
+ while (netIter != _networks.end()) {
+ Network* net = netIter.value();
+ emit networkRemoved(net->networkId());
+ disconnect(net, &Network::destroyed, this, nullptr);
+ netIter = _networks.erase(netIter);
+ net->deleteLater();
+ }
+ Q_ASSERT(_networks.isEmpty());
+
+ QHash<IdentityId, Identity*>::iterator idIter = _identities.begin();
+ while (idIter != _identities.end()) {
+ emit identityRemoved(idIter.key());
+ Identity* id = idIter.value();
+ idIter = _identities.erase(idIter);
+ id->deleteLater();
+ }
+ Q_ASSERT(_identities.isEmpty());
+
+ if (_networkConfig) {
+ _networkConfig->deleteLater();
+ _networkConfig = nullptr;
+ }
}
/*** ***/
-void Client::networkDestroyed() {
- Network *net = static_cast<Network *>(sender());
- QHash<NetworkId, Network *>::iterator netIter = _networks.begin();
- while(netIter != _networks.end()) {
- if(*netIter == net) {
- netIter = _networks.erase(netIter);
- break;
- } else {
- netIter++;
+void Client::networkDestroyed()
+{
+ auto* net = static_cast<Network*>(sender());
+ QHash<NetworkId, Network*>::iterator netIter = _networks.begin();
+ while (netIter != _networks.end()) {
+ if (*netIter == net) {
+ netIter = _networks.erase(netIter);
+ break;
+ }
+ else {
+ ++netIter;
+ }
}
- }
}
// Hmm... we never used this...
-void Client::recvStatusMsg(QString /*net*/, QString /*msg*/) {
- //recvMessage(net, Message::server("", QString("[STATUS] %1").arg(msg)));
+void Client::recvStatusMsg(QString /*net*/, QString /*msg*/)
+{
+ // recvMessage(net, Message::server("", QString("[STATUS] %1").arg(msg)));
}
-void Client::recvMessage(const Message &msg) {
- Message msg_ = msg;
- messageProcessor()->process(msg_);
+void Client::recvMessage(const Message& msg)
+{
+ Message msg_ = msg;
+ messageProcessor()->process(msg_);
}
-void Client::setBufferLastSeenMsg(BufferId id, const MsgId &msgId) {
- if(!bufferSyncer())
- return;
- bufferSyncer()->requestSetLastSeenMsg(id, msgId);
+void Client::setBufferLastSeenMsg(BufferId id, const MsgId& msgId)
+{
+ if (bufferSyncer())
+ bufferSyncer()->requestSetLastSeenMsg(id, msgId);
}
-void Client::removeBuffer(BufferId id) {
- if(!bufferSyncer()) return;
- bufferSyncer()->requestRemoveBuffer(id);
+void Client::setMarkerLine(BufferId id, const MsgId& msgId)
+{
+ if (bufferSyncer())
+ bufferSyncer()->requestSetMarkerLine(id, msgId);
}
-void Client::renameBuffer(BufferId bufferId, const QString &newName) {
- if(!bufferSyncer())
- return;
- bufferSyncer()->requestRenameBuffer(bufferId, newName);
+MsgId Client::markerLine(BufferId id)
+{
+ if (id.isValid() && networkModel())
+ return networkModel()->markerLineMsgId(id);
+ return {};
}
-void Client::mergeBuffersPermanently(BufferId bufferId1, BufferId bufferId2) {
- if(!bufferSyncer())
- return;
- bufferSyncer()->requestMergeBuffersPermanently(bufferId1, bufferId2);
+void Client::removeBuffer(BufferId id)
+{
+ if (!bufferSyncer())
+ return;
+ bufferSyncer()->requestRemoveBuffer(id);
}
-void Client::bufferRemoved(BufferId bufferId) {
- // select a sane buffer (status buffer)
- /* we have to manually select a buffer because otherwise inconsitent changes
- * to the model might occur:
- * the result of a buffer removal triggers a change in the selection model.
- * the newly selected buffer might be a channel that hasn't been selected yet
- * and a new nickview would be created (which never heard of the "rowsAboutToBeRemoved").
- * this new view (and/or) its sort filter will then only receive a "rowsRemoved" signal.
- */
- QModelIndex current = bufferModel()->currentIndex();
- if(current.data(NetworkModel::BufferIdRole).value<BufferId>() == bufferId) {
- bufferModel()->setCurrentIndex(current.sibling(0,0));
- }
+void Client::renameBuffer(BufferId bufferId, const QString& newName)
+{
+ if (!bufferSyncer())
+ return;
+ bufferSyncer()->requestRenameBuffer(bufferId, newName);
+}
- // and remove it from the model
- networkModel()->removeBuffer(bufferId);
+void Client::mergeBuffersPermanently(BufferId bufferId1, BufferId bufferId2)
+{
+ if (!bufferSyncer())
+ return;
+ bufferSyncer()->requestMergeBuffersPermanently(bufferId1, bufferId2);
}
-void Client::bufferRenamed(BufferId bufferId, const QString &newName) {
- QModelIndex bufferIndex = networkModel()->bufferIndex(bufferId);
- if(bufferIndex.isValid()) {
- networkModel()->setData(bufferIndex, newName, Qt::DisplayRole);
- }
+void Client::purgeKnownBufferIds()
+{
+ if (!bufferSyncer())
+ return;
+ bufferSyncer()->requestPurgeBufferIds();
}
-void Client::buffersPermanentlyMerged(BufferId bufferId1, BufferId bufferId2) {
- QModelIndex idx = networkModel()->bufferIndex(bufferId1);
- bufferModel()->setCurrentIndex(bufferModel()->mapFromSource(idx));
- networkModel()->removeBuffer(bufferId2);
+void Client::bufferRemoved(BufferId bufferId)
+{
+ // select a sane buffer (status buffer)
+ /* we have to manually select a buffer because otherwise inconsitent changes
+ * to the model might occur:
+ * the result of a buffer removal triggers a change in the selection model.
+ * the newly selected buffer might be a channel that hasn't been selected yet
+ * and a new nickview would be created (which never heard of the "rowsAboutToBeRemoved").
+ * this new view (and/or) its sort filter will then only receive a "rowsRemoved" signal.
+ */
+ QModelIndex current = bufferModel()->currentIndex();
+ if (current.data(NetworkModel::BufferIdRole).value<BufferId>() == bufferId) {
+ bufferModel()->setCurrentIndex(current.sibling(0, 0));
+ }
+
+ // and remove it from the model
+ networkModel()->removeBuffer(bufferId);
}
-void Client::logMessage(QtMsgType type, const char *msg) {
- fprintf(stderr, "%s\n", msg);
- fflush(stderr);
- if(type == QtFatalMsg) {
- Quassel::logFatalMessage(msg);
- } else {
- QString msgString = QString("%1\n").arg(msg);
- instance()->_debugLog << msgString;
- emit instance()->logUpdated(msgString);
- }
+void Client::bufferRenamed(BufferId bufferId, const QString& newName)
+{
+ QModelIndex bufferIndex = networkModel()->bufferIndex(bufferId);
+ if (bufferIndex.isValid()) {
+ networkModel()->setData(bufferIndex, newName, Qt::DisplayRole);
+ }
+}
+
+void Client::buffersPermanentlyMerged(BufferId bufferId1, BufferId bufferId2)
+{
+ QModelIndex idx = networkModel()->bufferIndex(bufferId1);
+ bufferModel()->setCurrentIndex(bufferModel()->mapFromSource(idx));
+ networkModel()->removeBuffer(bufferId2);
}
+void Client::markBufferAsRead(BufferId id)
+{
+ if (bufferSyncer() && id.isValid())
+ bufferSyncer()->requestMarkBufferAsRead(id);
+}
+
+void Client::refreshLegacyCoreInfo()
+{
+ instance()->requestLegacyCoreInfo();
+}
+
+void Client::changePassword(const QString& oldPassword, const QString& newPassword)
+{
+ CoreAccount account = currentCoreAccount();
+ account.setPassword(newPassword);
+ coreAccountModel()->createOrUpdateAccount(account);
+ emit instance()->requestPasswordChange(nullptr, account.user(), oldPassword, newPassword);
+}
+
+void Client::kickClient(int peerId)
+{
+ emit instance()->requestKickClient(peerId);
+}
+
+void Client::corePasswordChanged(PeerPtr, bool success)
+{
+ if (success)
+ coreAccountModel()->save();
+ emit passwordChanged(success);
+}
projects / quassel.git / blobdiff