X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fclientignorelistmanager.cpp;h=a23f8917a1d82ad849be70003b41429f0338d69e;hp=f146313fd3f74c3ef90f4813242ae74ce74d61eb;hb=6eefdfc697067d184a589fc8a231b16316c09106;hpb=f19fea582ace1d8f3dfe29c1096c48758079e56e

diff --git a/src/client/clientignorelistmanager.cpp b/src/client/clientignorelistmanager.cpp
index f146313f..a23f8917 100644
--- a/src/client/clientignorelistmanager.cpp
+++ b/src/client/clientignorelistmanager.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-09 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  *
@@ -15,43 +15,37 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
 #include "clientignorelistmanager.h"
 
-#include <QRegExp>
-
-INIT_SYNCABLE_OBJECT(ClientIgnoreListManager)
-
 ClientIgnoreListManager::ClientIgnoreListManager(QObject *parent)
     : IgnoreListManager(parent)
 {
-  connect(this, SIGNAL(updatedRemotely()), SIGNAL(ignoreListChanged()));
+    connect(this, &SyncableObject::updatedRemotely, this, &ClientIgnoreListManager::ignoreListChanged);
 }
 
-bool ClientIgnoreListManager::pureMatch(const IgnoreListItem &item, const QString &string) const {
-  QRegExp ruleRx = QRegExp(item.ignoreRule);
-  ruleRx.setCaseSensitivity(Qt::CaseInsensitive);
-  if(!item.isRegEx)
-    ruleRx.setPatternSyntax(QRegExp::Wildcard);
 
-  if((!item.isRegEx && ruleRx.exactMatch(string)) ||
-     (item.isRegEx && ruleRx.indexIn(string) != -1))
-    return true;
-  return false;
+bool ClientIgnoreListManager::pureMatch(const IgnoreListItem &item, const QString &string) const
+{
+    return (item.contentsMatcher().match(string));
 }
 
-QMap<QString, bool> ClientIgnoreListManager::matchingRulesForHostmask(const QString &hostmask, const QString &network, const QString &channel) const {
-  QMap<QString, bool> result;
-  foreach(IgnoreListItem item, ignoreList()) {
-    if(item.type == SenderIgnore && pureMatch(item, hostmask)
-      && ((network.isEmpty() && channel.isEmpty()) || item.scope == GlobalScope || (item.scope == NetworkScope && scopeMatch(item.scopeRule, network))
-          || (item.scope == ChannelScope && scopeMatch(item.scopeRule, channel)))) {
-      result[item.ignoreRule] = item.isActive;
-//      qDebug() << "matchingRulesForHostmask found: " << item.ignoreRule << "is active: " << item.isActive;
-    }
 
-  }
-  return result;
+QMap<QString, bool> ClientIgnoreListManager::matchingRulesForHostmask(const QString &hostmask, const QString &network, const QString &channel) const
+{
+    QMap<QString, bool> result;
+    foreach(IgnoreListItem item, ignoreList()) {
+        if (item.type() == SenderIgnore && pureMatch(item, hostmask)
+            && ((network.isEmpty() && channel.isEmpty())
+                || item.scope() == GlobalScope
+                || (item.scope() == NetworkScope && item.scopeRuleMatcher().match(network))
+                || (item.scope() == ChannelScope && item.scopeRuleMatcher().match(channel)))) {
+            result[item.contents()] = item.isEnabled();
+            // qDebug() << "matchingRulesForHostmask found: " << item.contents()
+            //         << "is active: " << item.isActive;
+        }
+    }
+    return result;
 }