X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcommon%2Fnetwork.cpp;h=dcca4f4978f1072f0e09e228a1cb1316c230629d;hb=74226102118400b228618f7373137a4a01e7d85f;hp=885cc50b113b4b0600d7a7f2a1d3393336ddaa24;hpb=b2c3e61e5888741644b24f5b3701a6311ec631dd;p=quassel.git diff --git a/src/common/network.cpp b/src/common/network.cpp index 885cc50b..dcca4f49 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; @@ -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 @@ -731,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) { @@ -749,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) { @@ -881,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()) { @@ -888,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(); @@ -930,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; @@ -954,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 }