/***************************************************************************
- * 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 *
bool isChannelName(const QString &str)
{
- static constexpr std::array<QChar, 4> prefixes{{'#', '&', '!', '+'}};
- return std::any_of(prefixes.cbegin(), prefixes.cend(), [&str](QChar c) { return c == str[0]; });
+ if (str.isEmpty())
+ return false;
+ static constexpr std::array<quint8, 4> prefixes{{'#', '&', '!', '+'}};
+ return std::any_of(prefixes.cbegin(), prefixes.cend(), [&str](quint8 c) { return c == str[0]; });
}
QString stripFormatCodes(QString message)
{
- static QRegExp regEx{"\x03(\\d\\d?(,\\d\\d?)?)?|[\x02\x0f\x12\x16\x1d\x1f]"};
+ static QRegExp regEx{"\x03(\\d\\d?(,\\d\\d?)?)?|\x04([\\da-fA-F]{6}(,[\\da-fA-F]{6})?)?|[\x02\x0f\x11\x12\x16\x1d\x1e\x1f]"};
return message.remove(regEx);
}
return formattedStr;
}
+
+
+QString tryFormatUnixEpoch(const QString &possibleEpochDate, Qt::DateFormat dateFormat, bool useUTC)
+{
+ // Does the string resemble a Unix epoch? Parse as 64-bit time
+ qint64 secsSinceEpoch = possibleEpochDate.toLongLong();
+ if (secsSinceEpoch == 0) {
+ // Parsing either failed, or '0' was sent. No need to distinguish; either way, it's not
+ // useful as epoch.
+ // See https://doc.qt.io/qt-5/qstring.html#toLongLong
+ return possibleEpochDate;
+ }
+
+ // Time checks out, parse it
+ QDateTime date;
+#if QT_VERSION >= 0x050800
+ date.setSecsSinceEpoch(secsSinceEpoch);
+#else
+ // toSecsSinceEpoch() was added in Qt 5.8. Manually downconvert to seconds for now.
+ // See https://doc.qt.io/qt-5/qdatetime.html#toMSecsSinceEpoch
+ date.setMSecsSinceEpoch(secsSinceEpoch * 1000);
+#endif
+
+ // Return the localized date/time
+ if (useUTC) {
+ // Return UTC time
+ return date.toUTC().toString(dateFormat);
+ } else if (dateFormat == Qt::DateFormat::ISODate) {
+ // Add in ISO local timezone information via special handling below
+ return formatDateTimeToOffsetISO(date);
+ } else {
+ // Return local time
+ return date.toString(dateFormat);
+ }
+}
+
+
+QString formatDateTimeToOffsetISO(const QDateTime &dateTime)
+{
+ if (!dateTime.isValid()) {
+ // Don't try to do anything with invalid date/time
+ return "formatDateTimeToISO() invalid date/time";
+ }
+
+#if 0
+ // The expected way to get a UTC offset on ISO8601 dates
+ return dateTime.toTimeSpec(Qt::OffsetFromUTC).toString(Qt::ISODate);
+#else
+ // Work around Qt bug that converts to UTC instead of including timezone information
+ // See https://bugreports.qt.io/browse/QTBUG-26161
+ //
+ // NOTE: Despite the bug report marking as fixed in Qt 5.2.0 (QT_VERSION >= 0x050200), this
+ // still appears broken in Qt 5.5.1.
+ //
+ // Credit to "user362638" for the solution below, modified to fit Quassel's needs
+ // https://stackoverflow.com/questions/18750569/qdatetime-isodate-with-timezone
+
+ // Get the local and UTC time
+ QDateTime local = QDateTime(dateTime);
+ QDateTime utc = local.toUTC();
+ utc.setTimeSpec(Qt::LocalTime);
+
+ // Find the UTC offset
+ int utcOffset = utc.secsTo(local);
+
+ // Force the local time to follow this offset
+ local.setUtcOffset(utcOffset);
+ // Now the output should be correct
+ return local.toString(Qt::ISODate);
+#endif
+}