/***************************************************************************
- * 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 *
void EventStringifier::processIrcEventPong(IrcEvent *e)
{
- QString timestamp = e->params().at(1);
+ // Some IRC servers respond with only one parameter, others respond with two, with the latter
+ // being the text sent. Handle both situations.
+ QString timestamp;
+ if (e->params().count() < 2) {
+ // Only one parameter received
+ // :localhost PONG 02:43:49.565
+ timestamp = e->params().at(0);
+ } else {
+ // Two parameters received, pick the second
+ // :localhost PONG localhost :02:43:49.565
+ timestamp = e->params().at(1);
+ }
+
+ // Attempt to parse the timestamp
QTime sendTime = QTime::fromString(timestamp, "hh:mm:ss.zzz");
- if (!sendTime.isValid())
+ if (!sendTime.isValid()) {
+ // No valid timestamp found, this is most likely a user-specified PING message.
+ //
+ // Or the IRC server is returning whatever it feels like to PING messages, in which case..
+ // sorry. Increase the ping timeout delay in Quassel to as high as possible, and go
+ // encourage your IRC server developer to fix their stuff.
displayMsg(e, Message::Server, "PONG " + e->params().join(" "), e->prefix());
+ }
}
target = nick;
IrcUser *ircuser = e->network()->ircUser(nick);
if (ircuser) {
- int now = QDateTime::currentDateTime().toTime_t();
+ QDateTime now = QDateTime::currentDateTime();
+ now.setTimeSpec(Qt::UTC);
+ // Don't print "user is away" messages more often than this
const int silenceTime = 60;
- if (ircuser->lastAwayMessage() + silenceTime >= now)
+ if (ircuser->lastAwayMessageTime().addSecs(silenceTime) >= now)
send = false;
- ircuser->setLastAwayMessage(now);
+ ircuser->setLastAwayMessageTime(now);
}
}
if (send)
int idleSecs = e->params()[1].toInt();
if (e->params().count() > 3) { // if we have more then 3 params we have the above mentioned "real life" situation
- QDateTime loginTime = QDateTime::fromTime_t(e->params()[2].toInt()).toUTC();
+ // Time in IRC protocol is defined as seconds. Convert from seconds instead.
+ // See https://doc.qt.io/qt-5/qdatetime.html#fromSecsSinceEpoch
+#if QT_VERSION >= 0x050800
+ QDateTime loginTime = QDateTime::fromSecsSinceEpoch(e->params()[2].toLongLong()).toUTC();
+#else
+ // fromSecsSinceEpoch() was added in Qt 5.8. Manually downconvert to seconds for now.
+ // See https://doc.qt.io/qt-5/qdatetime.html#fromMSecsSinceEpoch
+ QDateTime loginTime = QDateTime::fromMSecsSinceEpoch(
+ (qint64)(e->params()[2].toLongLong() * 1000)).toUTC();
+#endif
displayMsg(e, Message::Server, tr("[Whois] %1 is logged in since %2")
.arg(e->params()[0], loginTime.toString("yyyy-MM-dd hh:mm:ss UTC")));
}
switch (e->params().count()) {
case 3:
topic = e->params()[2];
+ [[clang::fallthrough]];
case 2:
userCount = e->params()[1].toUInt();
+ [[clang::fallthrough]];
case 1:
channelName = e->params()[0];
+ [[clang::fallthrough]];
default:
break;
}
return;
QString channel = e->params()[0];
- uint unixtime = e->params()[1].toUInt();
+ // Allow for 64-bit time
+ qint64 unixtime = e->params()[1].toLongLong();
if (!unixtime) {
qWarning() << Q_FUNC_INFO << "received invalid timestamp:" << e->params()[1];
return;
}
- QDateTime time = QDateTime::fromTime_t(unixtime).toUTC();
+ // Time in IRC protocol is defined as seconds. Convert from seconds instead.
+ // See https://doc.qt.io/qt-5/qdatetime.html#fromSecsSinceEpoch
+#if QT_VERSION >= 0x050800
+ QDateTime time = QDateTime::fromSecsSinceEpoch(unixtime).toUTC();
+#else
+ // fromSecsSinceEpoch() was added in Qt 5.8. Manually downconvert to seconds for now.
+ // See https://doc.qt.io/qt-5/qdatetime.html#fromMSecsSinceEpoch
+ QDateTime time = QDateTime::fromMSecsSinceEpoch((qint64)(unixtime * 1000)).toUTC();
+#endif
displayMsg(e, Message::Topic, tr("Channel %1 created on %2")
.arg(channel, time.toString("yyyy-MM-dd hh:mm:ss UTC")),
QString(), channel);
return;
QString channel = e->params().first();
- QDateTime topicSetTime = QDateTime::fromTime_t(e->params()[2].toInt()).toUTC();
+ // Time in IRC protocol is defined as seconds. Convert from seconds instead.
+ // See https://doc.qt.io/qt-5/qdatetime.html#fromSecsSinceEpoch
+#if QT_VERSION >= 0x050800
+ QDateTime topicSetTime = QDateTime::fromSecsSinceEpoch(e->params()[2].toLongLong()).toUTC();
+#else
+ // fromSecsSinceEpoch() was added in Qt 5.8. Manually downconvert to seconds for now.
+ // See https://doc.qt.io/qt-5/qdatetime.html#fromMSecsSinceEpoch
+ QDateTime topicSetTime = QDateTime::fromMSecsSinceEpoch(
+ (qint64)(e->params()[2].toLongLong() * 1000)).toUTC();
+#endif
displayMsg(e, Message::Topic, tr("Topic set by %1 on %2")
.arg(e->params()[1],
topicSetTime.toString("yyyy-MM-dd hh:mm:ss UTC")), QString(), channel);