X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcommon%2Futil.cpp;h=b42f4fbf5781a616be1cefe5bcbf3bafec737ee2;hb=047f7a5c2429d44adf0102ee25c7fb254f80ea69;hp=3d199a1281c0151026b5ded23f8068926cb0aa9e;hpb=0fa9ff5b58bf321654204867bb118a8d727d7b16;p=quassel.git

diff --git a/src/common/util.cpp b/src/common/util.cpp
index 3d199a12..b42f4fbf 100644
--- a/src/common/util.cpp
+++ b/src/common/util.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  *
@@ -64,6 +64,8 @@ QString hostFromMask(const QString &mask)
 
 bool isChannelName(const QString &str)
 {
+    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]; });
 }
@@ -71,7 +73,7 @@ bool isChannelName(const QString &str)
 
 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);
 }
 
@@ -278,3 +280,86 @@ QString formatCurrentDateTimeInString(const QString &formatStr)
 
     return formattedStr;
 }
+
+
+bool scopeMatch(const QString &string, const QString &scopeRule, const bool &isRegEx,
+                const bool &isCaseSensitive)
+{
+    // When isRegEx is false:
+    // 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.
+    //
+    // When isRegEx is true:
+    // A match happens when the normal regular expression matches.  If prefixed with '!', the match
+    // happens UNLESS the following regular expression matches.
+
+    // 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.
+
+    // Cache case sensitivity
+    Qt::CaseSensitivity ruleExactCase = (isCaseSensitive ? Qt::CaseSensitive : Qt::CaseInsensitive);
+
+    if (isRegEx) {
+        // Regular expression tests
+        // -------
+        // Check if this is an inverted rule (starts with '!')
+        if (scopeRule.startsWith("!")) {
+            // Take the reminder of the string
+            QRegExp ruleRx(scopeRule.mid(1), ruleExactCase);
+            // Matching an inverted rule: matched (true) implies rule failure (false)
+            return !ruleRx.exactMatch(string);
+        } else {
+            QRegExp ruleRx(scopeRule, ruleExactCase);
+            // Matching a normal rule: matched (true) implies rule success (true)
+            return ruleRx.exactMatch(string);
+        }
+    } else {
+        // Wildcard expression tests
+        // -------
+        // 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), ruleExactCase);
+                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, ruleExactCase);
+                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);
+    }
+}