X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fnetwork.cpp;h=d7c0980ed1f7868cdd7247813feb16289c39ba3a;hp=cb4adb5c82cc794bdbe89609b9026aba24acec83;hb=3e63cb8a6e83765069a45101b86ae9e21dcc57ad;hpb=0b983b0d9364e62db0b5e6cf25988ef8041a0c5d diff --git a/src/common/network.cpp b/src/common/network.cpp index cb4adb5c..d7c0980e 100644 --- a/src/common/network.cpp +++ b/src/common/network.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-2016 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 * @@ -18,9 +18,12 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ +#include + #include #include "network.h" +#include "peer.h" QTextCodec *Network::_defaultCodecForServer = 0; QTextCodec *Network::_defaultCodecForEncoding = 0; @@ -29,7 +32,7 @@ QTextCodec *Network::_defaultCodecForDecoding = 0; // ==================== // Public: // ==================== -INIT_SYNCABLE_OBJECT(Network) + Network::Network(const NetworkId &networkid, QObject *parent) : SyncableObject(parent), _proxy(0), @@ -176,6 +179,42 @@ QString Network::modeToPrefix(const QString &mode) const } +QString Network::sortPrefixModes(const QString &modes) const +{ + // If modes is empty or we don't have any modes, nothing can be sorted, bail out early + if (modes.isEmpty() || prefixModes().isEmpty()) { + return modes; + } + + // Store a copy of the modes for modification + // QString should be efficient and not copy memory if nothing changes, but if mistaken, + // std::is_sorted could be called first. + QString sortedModes = QString(modes); + + // Sort modes as if a QChar array + // See https://en.cppreference.com/w/cpp/algorithm/sort + // Defining lambda with [&] implicitly captures variables by reference + std::sort(sortedModes.begin(), sortedModes.end(), [&](const QChar &lmode, const QChar &rmode) { + // Compare characters according to prefix modes + // Return true if lmode comes before rmode (is "less than") + + // Check for unknown modes... + if (!prefixModes().contains(lmode)) { + // Left mode not in prefix list, send to end + return false; + } else if (!prefixModes().contains(rmode)) { + // Right mode not in prefix list, send to end + return true; + } else { + // Both characters known, sort according to index in prefixModes() + return (prefixModes().indexOf(lmode) < prefixModes().indexOf(rmode)); + } + }); + + return sortedModes; +} + + QStringList Network::nicks() const { // we don't use _ircUsers.keys() since the keys may be @@ -243,6 +282,14 @@ QString Network::support(const QString ¶m) const bool Network::saslMaybeSupports(const QString &saslMechanism) const { + if (!capAvailable(IrcCap::SASL)) { + // If SASL's not advertised at all, it's likely the mechanism isn't supported, as per specs. + // Unfortunately, we don't know for sure, but Quassel won't request SASL without it being + // advertised, anyways. + // This may also occur if the network's disconnected or negotiation hasn't yet happened. + return false; + } + // Get the SASL capability value QString saslCapValue = capValue(IrcCap::SASL); // SASL mechanisms are only specified in capability values as part of SASL 3.2. In SASL 3.1, @@ -723,8 +770,8 @@ void Network::setMessageRateBurstSize(quint32 burstSize) if (burstSize < 1) { // Can't go slower than one message at a time. Also blocks old clients from trying to set // this to 0. - qWarning() << "Received invalid setMessageRateBurstSize data - message burst size must be " - "non-zero positive, given" << burstSize; + qDebug() << "Received invalid setMessageRateBurstSize data - message burst size must be " + "non-zero positive, given" << burstSize; return; } if (_messageRateBurstSize != burstSize) { @@ -741,8 +788,8 @@ void Network::setMessageRateDelay(quint32 messageDelay) if (messageDelay == 0) { // Nonsensical to have no delay - just check the Unlimited box instead. Also blocks old // clients from trying to set this to 0. - qWarning() << "Received invalid setMessageRateDelay data - message delay must be non-zero " - "positive, given" << messageDelay; + qDebug() << "Received invalid setMessageRateDelay data - message delay must be non-zero " + "positive, given" << messageDelay; return; } if (_messageRateDelay != messageDelay) { @@ -873,6 +920,8 @@ QVariantMap Network::initCaps() const // (without compression) with a decent amount of IrcUsers. QVariantMap Network::initIrcUsersAndChannels() const { + Q_ASSERT(proxy()); + Q_ASSERT(proxy()->targetPeer()); QVariantMap usersAndChannels; if (_ircUsers.count()) { @@ -880,7 +929,21 @@ QVariantMap Network::initIrcUsersAndChannels() const QHash::const_iterator it = _ircUsers.begin(); QHash::const_iterator end = _ircUsers.end(); while (it != end) { - const QVariantMap &map = it.value()->toVariantMap(); + QVariantMap map = it.value()->toVariantMap(); + // If the peer doesn't support LongTime, replace the lastAwayMessageTime field + // with the 32-bit numerical seconds value (lastAwayMessage) used in older versions + if (!proxy()->targetPeer()->hasFeature(Quassel::Feature::LongTime)) { +#if QT_VERSION >= 0x050800 + int lastAwayMessage = it.value()->lastAwayMessageTime().toSecsSinceEpoch(); +#else + // toSecsSinceEpoch() was added in Qt 5.8. Manually downconvert to seconds for now. + // See https://doc.qt.io/qt-5/qdatetime.html#toMSecsSinceEpoch + int lastAwayMessage = it.value()->lastAwayMessageTime().toMSecsSinceEpoch() / 1000; +#endif + map.remove("lastAwayMessageTime"); + map["lastAwayMessage"] = lastAwayMessage; + } + QVariantMap::const_iterator mapiter = map.begin(); while (mapiter != map.end()) { users[mapiter.key()] << mapiter.value(); @@ -922,6 +985,7 @@ QVariantMap Network::initIrcUsersAndChannels() const void Network::initSetIrcUsersAndChannels(const QVariantMap &usersAndChannels) { Q_ASSERT(proxy()); + Q_ASSERT(proxy()->sourcePeer()); if (isInitialized()) { qWarning() << "Network" << networkId() << "received init data for users and channels although there already are known users or channels!"; return; @@ -946,6 +1010,22 @@ void Network::initSetIrcUsersAndChannels(const QVariantMap &usersAndChannels) QVariantMap map; foreach(const QString &key, users.keys()) map[key] = users[key].toList().at(i); + + // If the peer doesn't support LongTime, upconvert the lastAwayMessageTime field + // from the 32-bit numerical seconds value used in older versions to QDateTime + if (!proxy()->sourcePeer()->hasFeature(Quassel::Feature::LongTime)) { + QDateTime lastAwayMessageTime = QDateTime(); + lastAwayMessageTime.setTimeSpec(Qt::UTC); +#if QT_VERSION >= 0x050800 + lastAwayMessageTime.fromSecsSinceEpoch(map.take("lastAwayMessage").toInt()); +#else + // toSecsSinceEpoch() was added in Qt 5.8. Manually downconvert to seconds for now. + // See https://doc.qt.io/qt-5/qdatetime.html#toMSecsSinceEpoch + lastAwayMessageTime.fromMSecsSinceEpoch(map.take("lastAwayMessage").toInt() * 1000); +#endif + map["lastAwayMessageTime"] = lastAwayMessageTime; + } + newIrcUser(map["nick"].toString(), map); // newIrcUser() properly handles the hostmask being just the nick } @@ -1079,54 +1159,34 @@ void Network::determinePrefixes() const * NetworkInfo ************************************************************************/ -NetworkInfo::NetworkInfo() - : networkId(0), - identity(1), - useRandomServer(false), - useAutoIdentify(false), - autoIdentifyService("NickServ"), - useSasl(false), - useAutoReconnect(true), - autoReconnectInterval(60), - autoReconnectRetries(20), - unlimitedReconnectRetries(false), - rejoinChannels(true), - useCustomMessageRate(false), - messageRateBurstSize(5), - messageRateDelay(2200), - unlimitedMessageRate(false) -{ -} - bool NetworkInfo::operator==(const NetworkInfo &other) const { - if (networkId != other.networkId) return false; - if (networkName != other.networkName) return false; - if (identity != other.identity) return false; - if (codecForServer != other.codecForServer) return false; - if (codecForEncoding != other.codecForEncoding) return false; - if (codecForDecoding != other.codecForDecoding) return false; - if (serverList != other.serverList) return false; - if (useRandomServer != other.useRandomServer) return false; - if (perform != other.perform) return false; - if (useAutoIdentify != other.useAutoIdentify) return false; - if (autoIdentifyService != other.autoIdentifyService) return false; - if (autoIdentifyPassword != other.autoIdentifyPassword) return false; - if (useSasl != other.useSasl) return false; - if (saslAccount != other.saslAccount) return false; - if (saslPassword != other.saslPassword) return false; - if (useAutoReconnect != other.useAutoReconnect) return false; - if (autoReconnectInterval != other.autoReconnectInterval) return false; - if (autoReconnectRetries != other.autoReconnectRetries) return false; - if (unlimitedReconnectRetries != other.unlimitedReconnectRetries) return false; - if (rejoinChannels != other.rejoinChannels) return false; - // Custom rate limiting - if (useCustomMessageRate != other.useCustomMessageRate) return false; - if (messageRateBurstSize != other.messageRateBurstSize) return false; - if (messageRateDelay != other.messageRateDelay) return false; - if (unlimitedMessageRate != other.unlimitedMessageRate) return false; - return true; + return networkName == other.networkName + && serverList == other.serverList + && perform == other.perform + && autoIdentifyService == other.autoIdentifyService + && autoIdentifyPassword == other.autoIdentifyPassword + && saslAccount == other.saslAccount + && saslPassword == other.saslPassword + && codecForServer == other.codecForServer + && codecForEncoding == other.codecForEncoding + && codecForDecoding == other.codecForDecoding + && networkId == other.networkId + && identity == other.identity + && messageRateBurstSize == other.messageRateBurstSize + && messageRateDelay == other.messageRateDelay + && autoReconnectInterval == other.autoReconnectInterval + && autoReconnectRetries == other.autoReconnectRetries + && rejoinChannels == other.rejoinChannels + && useRandomServer == other.useRandomServer + && useAutoIdentify == other.useAutoIdentify + && useSasl == other.useSasl + && useAutoReconnect == other.useAutoReconnect + && unlimitedReconnectRetries == other.unlimitedReconnectRetries + && useCustomMessageRate == other.useCustomMessageRate + && unlimitedMessageRate == other.unlimitedMessageRate + ; } @@ -1139,31 +1199,30 @@ bool NetworkInfo::operator!=(const NetworkInfo &other) const QDataStream &operator<<(QDataStream &out, const NetworkInfo &info) { QVariantMap i; - i["NetworkId"] = QVariant::fromValue(info.networkId); - i["NetworkName"] = info.networkName; - i["Identity"] = QVariant::fromValue(info.identity); - i["CodecForServer"] = info.codecForServer; - i["CodecForEncoding"] = info.codecForEncoding; - i["CodecForDecoding"] = info.codecForDecoding; - i["ServerList"] = toVariantList(info.serverList); - i["UseRandomServer"] = info.useRandomServer; - i["Perform"] = info.perform; - i["UseAutoIdentify"] = info.useAutoIdentify; - i["AutoIdentifyService"] = info.autoIdentifyService; - i["AutoIdentifyPassword"] = info.autoIdentifyPassword; - i["UseSasl"] = info.useSasl; - i["SaslAccount"] = info.saslAccount; - i["SaslPassword"] = info.saslPassword; - i["UseAutoReconnect"] = info.useAutoReconnect; - i["AutoReconnectInterval"] = info.autoReconnectInterval; - i["AutoReconnectRetries"] = info.autoReconnectRetries; + i["NetworkName"] = info.networkName; + i["ServerList"] = toVariantList(info.serverList); + i["Perform"] = info.perform; + i["AutoIdentifyService"] = info.autoIdentifyService; + i["AutoIdentifyPassword"] = info.autoIdentifyPassword; + i["SaslAccount"] = info.saslAccount; + i["SaslPassword"] = info.saslPassword; + i["CodecForServer"] = info.codecForServer; + i["CodecForEncoding"] = info.codecForEncoding; + i["CodecForDecoding"] = info.codecForDecoding; + i["NetworkId"] = QVariant::fromValue(info.networkId); + i["Identity"] = QVariant::fromValue(info.identity); + i["MessageRateBurstSize"] = info.messageRateBurstSize; + i["MessageRateDelay"] = info.messageRateDelay; + i["AutoReconnectInterval"] = info.autoReconnectInterval; + i["AutoReconnectRetries"] = info.autoReconnectRetries; + i["RejoinChannels"] = info.rejoinChannels; + i["UseRandomServer"] = info.useRandomServer; + i["UseAutoIdentify"] = info.useAutoIdentify; + i["UseSasl"] = info.useSasl; + i["UseAutoReconnect"] = info.useAutoReconnect; i["UnlimitedReconnectRetries"] = info.unlimitedReconnectRetries; - i["RejoinChannels"] = info.rejoinChannels; - // Custom rate limiting - i["UseCustomMessageRate"] = info.useCustomMessageRate; - i["MessageRateBurstSize"] = info.messageRateBurstSize; - i["MessageRateDelay"] = info.messageRateDelay; - i["UnlimitedMessageRate"] = info.unlimitedMessageRate; + i["UseCustomMessageRate"] = info.useCustomMessageRate; + i["UnlimitedMessageRate"] = info.unlimitedMessageRate; out << i; return out; } @@ -1173,31 +1232,30 @@ QDataStream &operator>>(QDataStream &in, NetworkInfo &info) { QVariantMap i; in >> i; - info.networkId = i["NetworkId"].value(); - info.networkName = i["NetworkName"].toString(); - info.identity = i["Identity"].value(); - info.codecForServer = i["CodecForServer"].toByteArray(); - info.codecForEncoding = i["CodecForEncoding"].toByteArray(); - info.codecForDecoding = i["CodecForDecoding"].toByteArray(); - info.serverList = fromVariantList(i["ServerList"].toList()); - info.useRandomServer = i["UseRandomServer"].toBool(); - info.perform = i["Perform"].toStringList(); - info.useAutoIdentify = i["UseAutoIdentify"].toBool(); - info.autoIdentifyService = i["AutoIdentifyService"].toString(); - info.autoIdentifyPassword = i["AutoIdentifyPassword"].toString(); - info.useSasl = i["UseSasl"].toBool(); - info.saslAccount = i["SaslAccount"].toString(); - info.saslPassword = i["SaslPassword"].toString(); - info.useAutoReconnect = i["UseAutoReconnect"].toBool(); - info.autoReconnectInterval = i["AutoReconnectInterval"].toUInt(); - info.autoReconnectRetries = i["AutoReconnectRetries"].toInt(); + info.networkName = i["NetworkName"].toString(); + info.serverList = fromVariantList(i["ServerList"].toList()); + info.perform = i["Perform"].toStringList(); + info.autoIdentifyService = i["AutoIdentifyService"].toString(); + info.autoIdentifyPassword = i["AutoIdentifyPassword"].toString(); + info.saslAccount = i["SaslAccount"].toString(); + info.saslPassword = i["SaslPassword"].toString(); + info.codecForServer = i["CodecForServer"].toByteArray(); + info.codecForEncoding = i["CodecForEncoding"].toByteArray(); + info.codecForDecoding = i["CodecForDecoding"].toByteArray(); + info.networkId = i["NetworkId"].value(); + info.identity = i["Identity"].value(); + info.messageRateBurstSize = i["MessageRateBurstSize"].toUInt(); + info.messageRateDelay = i["MessageRateDelay"].toUInt(); + info.autoReconnectInterval = i["AutoReconnectInterval"].toUInt(); + info.autoReconnectRetries = i["AutoReconnectRetries"].toInt(); + info.rejoinChannels = i["RejoinChannels"].toBool(); + info.useRandomServer = i["UseRandomServer"].toBool(); + info.useAutoIdentify = i["UseAutoIdentify"].toBool(); + info.useSasl = i["UseSasl"].toBool(); + info.useAutoReconnect = i["UseAutoReconnect"].toBool(); info.unlimitedReconnectRetries = i["UnlimitedReconnectRetries"].toBool(); - info.rejoinChannels = i["RejoinChannels"].toBool(); - // Custom rate limiting - info.useCustomMessageRate = i["UseCustomMessageRate"].toBool(); - info.messageRateBurstSize = i["MessageRateBurstSize"].toUInt(); - info.messageRateDelay = i["MessageRateDelay"].toUInt(); - info.unlimitedMessageRate = i["UnlimitedMessageRate"].toBool(); + info.useCustomMessageRate = i["UseCustomMessageRate"].toBool(); + info.unlimitedMessageRate = i["UnlimitedMessageRate"].toBool(); return in; }