_server(),
// _idleTime(QDateTime::currentDateTime()),
_ircOperator(),
- _lastAwayMessage(),
+ _lastAwayMessageTime(),
_whoisServiceReply(),
_encrypted(false),
_network(network),
_codecForDecoding(0)
{
updateObjectName();
- _lastAwayMessage.setTimeSpec(Qt::UTC);
- _lastAwayMessage.setMSecsSinceEpoch(0);
+ _lastAwayMessageTime.setTimeSpec(Qt::UTC);
+ _lastAwayMessageTime.setMSecsSinceEpoch(0);
}
}
-void IrcUser::setLastAwayMessage(const QDateTime &lastAwayMessage)
+// This function is only ever called by SYNC calls from legacy cores (pre-0.13).
+// Therefore, no SYNC call is needed here.
+void IrcUser::setLastAwayMessage(const int &lastAwayMessage)
{
- if (lastAwayMessage > _lastAwayMessage) {
- _lastAwayMessage = lastAwayMessage;
- SYNC(ARG(lastAwayMessage))
+ QDateTime lastAwayMessageTime = QDateTime();
+ lastAwayMessageTime.setTimeSpec(Qt::UTC);
+#if QT_VERSION >= 0x050800
+ lastAwayMessageTime.fromSecsSinceEpoch(lastAwayMessage);
+#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(lastAwayMessage * 1000);
+#endif
+ setLastAwayMessageTime(lastAwayMessageTime);
+}
+
+
+void IrcUser::setLastAwayMessageTime(const QDateTime &lastAwayMessageTime)
+{
+ if (lastAwayMessageTime > _lastAwayMessageTime) {
+ _lastAwayMessageTime = lastAwayMessageTime;
+ SYNC(ARG(lastAwayMessageTime))
}
}
Q_PROPERTY(QDateTime loginTime READ loginTime WRITE setLoginTime)
Q_PROPERTY(QString server READ server WRITE setServer)
Q_PROPERTY(QString ircOperator READ ircOperator WRITE setIrcOperator)
- Q_PROPERTY(QDateTime lastAwayMessage READ lastAwayMessage WRITE setLastAwayMessage)
+ // lastAwayMessage is only set by legacy (pre-0.13) cores, which automatically gets converted to
+ // the appropriate lastAwayMessageTime. Do not use this in new code.
+ Q_PROPERTY(int lastAwayMessage WRITE setLastAwayMessage)
+ Q_PROPERTY(QDateTime lastAwayMessageTime READ lastAwayMessageTime WRITE setLastAwayMessageTime)
Q_PROPERTY(QString whoisServiceReply READ whoisServiceReply WRITE setWhoisServiceReply)
Q_PROPERTY(QString suserHost READ suserHost WRITE setSuserHost)
Q_PROPERTY(bool encrypted READ encrypted WRITE setEncrypted)
inline QDateTime loginTime() const { return _loginTime; }
inline QString server() const { return _server; }
inline QString ircOperator() const { return _ircOperator; }
- inline QDateTime lastAwayMessage() const { return _lastAwayMessage; }
+ inline QDateTime lastAwayMessageTime() const { return _lastAwayMessageTime; }
inline QString whoisServiceReply() const { return _whoisServiceReply; }
inline QString suserHost() const { return _suserHost; }
inline bool encrypted() const { return _encrypted; }
void setLoginTime(const QDateTime &loginTime);
void setServer(const QString &server);
void setIrcOperator(const QString &ircOperator);
- void setLastAwayMessage(const QDateTime &lastAwayMessage);
+ // setLastAwayMessage is only called by legacy (pre-0.13) cores, which automatically gets
+ // converted to setting the appropriate lastAwayMessageTime. Do not use this in new code.
+ void setLastAwayMessage(const int &lastAwayMessage);
+ void setLastAwayMessageTime(const QDateTime &lastAwayMessageTime);
void setWhoisServiceReply(const QString &whoisServiceReply);
void setSuserHost(const QString &suserHost);
void setEncrypted(bool encrypted);
// void loginTimeSet(QDateTime loginTime);
// void serverSet(QString server);
// void ircOperatorSet(QString ircOperator);
-// void lastAwayMessageSet(QDateTime lastAwayMessage);
+// void lastAwayMessageTimeSet(QDateTime lastAwayMessageTime);
// void whoisServiceReplySet(QString whoisServiceReply);
// void suserHostSet(QString suserHost);
void encryptedSet(bool encrypted);
QDateTime _idleTimeSet;
QDateTime _loginTime;
QString _ircOperator;
- QDateTime _lastAwayMessage;
+ QDateTime _lastAwayMessageTime;
QString _whoisServiceReply;
QString _suserHost;
bool _encrypted;
QHash<QString, IrcUser *>::const_iterator end = _ircUsers.end();
while (it != end) {
QVariantMap map = it.value()->toVariantMap();
- // If the peer doesn't support LongTime, replace the lastAwayMessage field
- // with the 32-bit numerical seconds value used in older versions
+ // 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()->lastAwayMessage().toSecsSinceEpoch();
+ 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()->lastAwayMessage().toMSecsSinceEpoch() / 1000;
+ int lastAwayMessage = it.value()->lastAwayMessageTime().toMSecsSinceEpoch() / 1000;
#endif
+ map.remove("lastAwayMessageTime");
map["lastAwayMessage"] = lastAwayMessage;
}
foreach(const QString &key, users.keys())
map[key] = users[key].toList().at(i);
- // If the peer doesn't support LongTime, upconvert the lastAwayMessage field
+ // 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 lastAwayMessage = QDateTime();
- lastAwayMessage.setTimeSpec(Qt::UTC);
+ QDateTime lastAwayMessageTime = QDateTime();
+ lastAwayMessageTime.setTimeSpec(Qt::UTC);
#if QT_VERSION >= 0x050800
- lastAwayMessage.fromSecsSinceEpoch(map["lastAwayMessage"].toInt());
+ 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
- lastAwayMessage.fromMSecsSinceEpoch(map["lastAwayMessage"].toInt() * 1000);
+ lastAwayMessageTime.fromMSecsSinceEpoch(map.take("lastAwayMessage").toInt() * 1000);
#endif
- map["lastAwayMessage"] = lastAwayMessage;
+ map["lastAwayMessageTime"] = lastAwayMessageTime;
}
newIrcUser(map["nick"].toString(), map); // newIrcUser() properly handles the hostmask being just the nick
if (ircuser) {
ircuser->setAway(true);
ircuser->setAwayMessage(e->params().at(1));
- //ircuser->setLastAwayMessage(now);
+ // lastAwayMessageTime is set in EventStringifier::processIrcEvent301(), no need to set it
+ // here too
+ //ircuser->setLastAwayMessageTime(now);
}
}
now.setTimeSpec(Qt::UTC);
// Don't print "user is away" messages more often than this
const int silenceTime = 60;
- if (ircuser->lastAwayMessage().addSecs(silenceTime) >= now)
+ if (ircuser->lastAwayMessageTime().addSecs(silenceTime) >= now)
send = false;
- ircuser->setLastAwayMessage(now);
+ ircuser->setLastAwayMessageTime(now);
}
}
if (send)