/***************************************************************************
- * 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 *
#include "util.h"
+#include <algorithm>
+#include <array>
+#include <utility>
+
#include <QCoreApplication>
+#include <QDateTime>
#include <QDebug>
-#include <QFile>
#include <QTextCodec>
+#include <QVector>
#include "quassel.h"
-class QMetaMethod;
-
// MIBenum values from http://www.iana.org/assignments/character-sets/character-sets.xml#table-character-sets-1
static QList<int> utf8DetectionBlacklist = QList<int>()
<< 39 /* ISO-2022-JP */;
-QString nickFromMask(QString mask)
+QString nickFromMask(const QString &mask)
{
- return mask.section('!', 0, 0);
+ return mask.left(mask.indexOf('!'));
}
-QString userFromMask(QString mask)
+QString userFromMask(const QString &mask)
{
- QString userhost = mask.section('!', 1);
- if (userhost.isEmpty()) return QString();
- return userhost.section('@', 0, 0);
+ const int offset = mask.indexOf('!') + 1;
+ if (offset <= 0)
+ return {};
+ const int length = mask.indexOf('@', offset) - offset;
+ return mask.mid(offset, length >= 0 ? length : -1);
}
-QString hostFromMask(QString mask)
+QString hostFromMask(const QString &mask)
{
- QString userhost = mask.section('!', 1);
- if (userhost.isEmpty()) return QString();
- return userhost.section('@', 1);
+ const int excl = mask.indexOf('!');
+ if (excl < 0)
+ return {};
+ const int offset = mask.indexOf('@', excl + 1) + 1;
+ return offset > 0 && offset < mask.size() ? mask.mid(offset) : QString{};
}
-bool isChannelName(QString str)
+bool isChannelName(const QString &str)
{
- return QString("#&!+").contains(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 str)
+QString stripFormatCodes(QString message)
{
- str.remove(QRegExp("\x03(\\d\\d?(,\\d\\d?)?)?"));
- str.remove('\x02');
- str.remove('\x0f');
- str.remove('\x12');
- str.remove('\x16');
- str.remove('\x1d');
- str.remove('\x1f');
- return str;
+ 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);
}
QString secondsToString(int timeInSeconds)
{
- QList<QPair<int, QString> > timeUnit;
- timeUnit.append(qMakePair(365*24*60*60, QCoreApplication::translate("Quassel::secondsToString()", "year")));
- timeUnit.append(qMakePair(24*60*60, QCoreApplication::translate("Quassel::secondsToString()", "day")));
- timeUnit.append(qMakePair(60*60, QCoreApplication::translate("Quassel::secondsToString()", "h")));
- timeUnit.append(qMakePair(60, QCoreApplication::translate("Quassel::secondsToString()", "min")));
- timeUnit.append(qMakePair(1, QCoreApplication::translate("Quassel::secondsToString()", "sec")));
+ static QVector<std::pair<int, QString>> timeUnit {
+ std::make_pair(365*24*60*60, QCoreApplication::translate("Quassel::secondsToString()", "year")),
+ std::make_pair(24*60*60, QCoreApplication::translate("Quassel::secondsToString()", "day")),
+ std::make_pair(60*60, QCoreApplication::translate("Quassel::secondsToString()", "h")),
+ std::make_pair(60, QCoreApplication::translate("Quassel::secondsToString()", "min")),
+ std::make_pair(1, QCoreApplication::translate("Quassel::secondsToString()", "sec"))
+ };
if (timeInSeconds != 0) {
QStringList returnString;
return formattedStr;
}
+
+
+bool scopeMatch(const QString &scopeRule, const QString &string)
+{
+ // A match happens when the string does NOT match ANY inverted rules and matches AT LEAST one
+ // normal rule, unless no normal rules exist (implicit wildcard match). This gives inverted
+ // rules higher priority regardless of ordering.
+ //
+ // TODO: After switching to Qt 5, use of this should be split into two parts, one part that
+ // would generate compiled QRegularExpressions for match/inverted match, regenerating it on any
+ // rule changes, and another part that would check each message against these compiled rules.
+
+ // Keep track if any matches are found
+ bool matches = false;
+ // Keep track if normal rules and inverted rules are found, allowing for implicit wildcard
+ bool normalRuleFound = false, invertedRuleFound = false;
+
+ // Split each scope rule by separator, ignoring empty parts
+ foreach(QString rule, scopeRule.split(";", QString::SkipEmptyParts)) {
+ // Trim whitespace from the start/end of the rule
+ rule = rule.trimmed();
+ // Ignore empty rules
+ if (rule.isEmpty())
+ continue;
+
+ // Check if this is an inverted rule (starts with '!')
+ if (rule.startsWith("!")) {
+ // Inverted rule found
+ invertedRuleFound = true;
+
+ // Take the reminder of the string
+ QRegExp ruleRx(rule.mid(1), Qt::CaseInsensitive);
+ ruleRx.setPatternSyntax(QRegExp::Wildcard);
+ if (ruleRx.exactMatch(string)) {
+ // Matches an inverted rule, full rule cannot match
+ return false;
+ }
+ } else {
+ // Normal rule found
+ normalRuleFound = true;
+
+ QRegExp ruleRx(rule, Qt::CaseInsensitive);
+ ruleRx.setPatternSyntax(QRegExp::Wildcard);
+ if (ruleRx.exactMatch(string)) {
+ // Matches a normal rule, full rule might match
+ matches = true;
+ // Continue checking in case other inverted rules negate this
+ }
+ }
+ }
+ // No inverted rules matched, okay to match normally
+ // Return true if...
+ // ...we found a normal match
+ // ...implicit wildcard: we had inverted rules (that didn't match) and no normal rules
+ return matches || (invertedRuleFound && !normalRuleFound);
+}