/***************************************************************************
- * Copyright (C) 2005-2014 by the Quassel Project *
+ * Copyright (C) 2005-2016 by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
#include "corebuffersyncer.h"
#include "corebacklogmanager.h"
#include "corebufferviewmanager.h"
+#include "coredccconfig.h"
#include "coreeventmanager.h"
#include "coreidentity.h"
#include "coreignorelistmanager.h"
#include "ircuser.h"
#include "logger.h"
#include "messageevent.h"
+#include "remotepeer.h"
#include "storage.h"
#include "util.h"
-#include "protocols/legacy/legacypeer.h"
class ProcessMessagesEvent : public QEvent
{
_bufferSyncer(new CoreBufferSyncer(this)),
_backlogManager(new CoreBacklogManager(this)),
_bufferViewManager(new CoreBufferViewManager(_signalProxy, this)),
+ _dccConfig(new CoreDccConfig(this)),
_ircListHelper(new CoreIrcListHelper(this)),
_networkConfig(new CoreNetworkConfig("GlobalNetworkConfig", this)),
_coreInfo(this),
_ircParser(new IrcParser(this)),
scriptEngine(new QScriptEngine(this)),
_processMessages(false),
- _ignoreListManager(this)
+ _ignoreListManager(this),
+ _highlightRuleManager(this)
{
SignalProxy *p = signalProxy();
p->setHeartBeatInterval(30);
p->attachSlot(SIGNAL(createNetwork(const NetworkInfo &, const QStringList &)), this, SLOT(createNetwork(const NetworkInfo &, const QStringList &)));
p->attachSlot(SIGNAL(removeNetwork(NetworkId)), this, SLOT(removeNetwork(NetworkId)));
+ p->attachSlot(SIGNAL(changePassword(PeerPtr,QString,QString,QString)), this, SLOT(changePassword(PeerPtr,QString,QString,QString)));
+ p->attachSignal(this, SIGNAL(passwordChanged(PeerPtr,bool)));
+
+ p->attachSlot(SIGNAL(kickClient(int)), this, SLOT(kickClient(int)));
+ p->attachSignal(this, SIGNAL(disconnectFromCore()));
+
loadSettings();
initScriptEngine();
p->synchronize(_bufferSyncer);
p->synchronize(&aliasManager());
p->synchronize(_backlogManager);
+ p->synchronize(dccConfig());
p->synchronize(ircListHelper());
p->synchronize(networkConfig());
p->synchronize(&_coreInfo);
p->synchronize(&_ignoreListManager);
+ p->synchronize(&_highlightRuleManager);
p->synchronize(transferManager());
// Restore session state
if (restoreState)
CoreSession::~CoreSession()
{
saveSessionState();
+
+ /* Why partially duplicate CoreNetwork destructor? When each CoreNetwork quits in the
+ * destructor, disconnections are processed in sequence for each object. For many IRC servers
+ * on a slow network, this could significantly delay core shutdown [msecs wait * network count].
+ *
+ * Here, CoreSession first calls disconnect on all networks, letting them all start
+ * disconnecting before beginning to sequentially wait for each network. Ideally, after the
+ * first network is disconnected, the other networks will have already closed. Worst-case may
+ * still wait [msecs wait time * num. of networks], but the risk should be much lower.
+ *
+ * CoreNetwork should still do cleanup in its own destructor in case a network is deleted
+ * outside of deleting the whole CoreSession.
+ *
+ * If this proves to be problematic in the future, there's an alternative Qt signal-based system
+ * implemented in another pull request that guarentees a maximum amount of time to disconnect,
+ * but at the cost of more complex code.
+ *
+ * See https://github.com/quassel/quassel/pull/203
+ */
+
+ foreach(CoreNetwork *net, _networks.values()) {
+ // Request each network properly disconnect, but don't count as user-requested disconnect
+ if (net->socketConnected()) {
+ // Only try if the socket's fully connected (not initializing or disconnecting).
+ // Force an immediate disconnect, jumping the command queue. Ensures the proper QUIT is
+ // shown even if other messages are queued.
+ net->disconnectFromIrc(false, QString(), false, true);
+ }
+ }
+
+ // Process the putCmd events that trigger the quit. Without this, shutting down the core
+ // results in abrubtly closing the socket rather than sending the QUIT as expected.
+ QCoreApplication::processEvents();
+
foreach(CoreNetwork *net, _networks.values()) {
+ // Wait briefly for each network to disconnect. Sometimes it takes a little while to send.
+ if (!net->forceDisconnect()) {
+ qWarning() << "Timed out quitting network" << net->networkName() <<
+ "(user ID " << net->userId() << ")";
+ }
+ // Delete the network now that it's closed
delete net;
}
}
networkIter = networkInfos.erase(networkIter);
}
else {
- networkIter++;
+ ++networkIter;
}
}
s.removeIdentity(id);
if (_ignoreListManager.match(rawMsg, networkName) == IgnoreListManager::HardStrictness)
return;
+ if (_highlightRuleManager.match(rawMsg, currentNetwork->myNick(), currentNetwork->identityPtr()->nicks()))
+ rawMsg.flags |= Message::Flag::Highlight;
+
_messageQueue << rawMsg;
if (!_processMessages) {
_processMessages = true;
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);
+ Message msg(bufferInfo, rawMsg.type, rawMsg.text, rawMsg.sender,
+ senderPrefixes(rawMsg.sender, bufferInfo), rawMsg.flags);
+ if(Core::storeMessage(msg))
+ emit displayMsg(msg);
}
else {
QHash<NetworkId, QHash<QString, BufferInfo> > bufferInfoCache;
}
bufferInfoCache[rawMsg.networkId][rawMsg.target] = bufferInfo;
}
- Message msg(bufferInfo, rawMsg.type, rawMsg.text, rawMsg.sender, rawMsg.flags);
+ Message msg(bufferInfo, rawMsg.type, rawMsg.text, rawMsg.sender,
+ senderPrefixes(rawMsg.sender, bufferInfo), rawMsg.flags);
messages << msg;
}
// 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);
+ Message msg(bufferInfo, rawMsg.type, rawMsg.text, rawMsg.sender,
+ senderPrefixes(rawMsg.sender, bufferInfo), 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]);
+ if(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();
}
+QString CoreSession::senderPrefixes(const QString &sender, const BufferInfo &bufferInfo) const
+{
+ CoreNetwork *currentNetwork = network(bufferInfo.networkId());
+ if (!currentNetwork) {
+ return {};
+ }
+
+ if (bufferInfo.type() != BufferInfo::ChannelBuffer) {
+ return {};
+ }
+
+ IrcChannel *currentChannel = currentNetwork->ircChannel(bufferInfo.bufferName());
+ if (!currentChannel) {
+ return {};
+ }
+
+ const QString modes = currentChannel->userModes(nickFromMask(sender).toLower());
+ return currentNetwork->modesToPrefixes(modes);
+}
Protocol::SessionState CoreSession::sessionState() const
{
messageIter = _messageQueue.erase(messageIter);
}
else {
- messageIter++;
+ ++messageIter;
}
}
// remove buffers from syncer
IrcUser *me = 0;
while (netIter != _networks.end()) {
net = *netIter;
- netIter++;
+ ++netIter;
if (!net->isConnected())
continue;
QString awayReason;
while (netIter != _networks.end()) {
net = *netIter;
- netIter++;
+ ++netIter;
if (!net->isConnected())
continue;
if (!identity->detachAwayReason().isEmpty())
awayReason = identity->detachAwayReason();
net->setAutoAwayActive(true);
+ // Allow handleAway() to format the current date/time in the string.
net->userInputHandler()->handleAway(BufferInfo(), awayReason);
}
}
}
-void CoreSession::globalAway(const QString &msg)
+void CoreSession::globalAway(const QString &msg, const bool skipFormatting)
{
QHash<NetworkId, CoreNetwork *>::iterator netIter = _networks.begin();
CoreNetwork *net = 0;
while (netIter != _networks.end()) {
net = *netIter;
- netIter++;
+ ++netIter;
if (!net->isConnected())
continue;
- net->userInputHandler()->issueAway(msg, false /* no force away */);
+ net->userInputHandler()->issueAway(msg, false /* no force away */, skipFormatting);
+ }
+}
+
+void CoreSession::changePassword(PeerPtr peer, const QString &userName, const QString &oldPassword, const QString &newPassword) {
+ Q_UNUSED(peer);
+
+ bool success = false;
+ UserId uid = Core::validateUser(userName, oldPassword);
+ if (uid.isValid() && uid == user())
+ success = Core::changeUserPassword(uid, newPassword);
+
+ signalProxy()->restrictTargetPeers(signalProxy()->sourcePeer(), [&]{
+ emit passwordChanged(nullptr, success);
+ });
+}
+
+void CoreSession::kickClient(int peerId) {
+ auto peer = signalProxy()->peerById(peerId);
+ if (peer == nullptr) {
+ qWarning() << "Invalid peer Id: " << peerId;
+ return;
}
+ signalProxy()->restrictTargetPeers(peer, [&]{
+ emit disconnectFromCore();
+ });
}
projects / quassel.git / blobdiff